From bc9bae086f313b756484a18908300d024116b701 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Mon, 22 Sep 2008 18:53:56 +0000 Subject: [PATCH] jtr: Force linefeed to 0x0D. --- jtr.c | 13 +++---- reference/track/expertgps.jtr | 65 +---------------------------------- 2 files changed, 5 insertions(+), 73 deletions(-) diff --git a/jtr.c b/jtr.c index d0a2bf74c..65f0e1936 100644 --- a/jtr.c +++ b/jtr.c @@ -165,6 +165,7 @@ jtr_read(void) if (avltree_find(trkpts, buf, NULL)) continue; wpt = waypt_new(); + avltree_insert(trkpts, buf, wpt); wpt->latitude = lat; wpt->longitude = lon; @@ -189,7 +190,6 @@ jtr_read(void) track_add_head(trk); } - avltree_insert(trkpts, buf, wpt); track_add_wpt(trk, wpt); } } @@ -209,7 +209,7 @@ jtr_wr_deinit(void) static void jtr_trkpt_disp_cb(const waypoint *wpt) { - char *str, *tmp; + char *str; char stime[10], sdate[7], scourse[6], sspeed[8]; struct tm tm; @@ -243,13 +243,8 @@ jtr_trkpt_disp_cb(const waypoint *wpt) scourse, sdate); - xasprintf(&tmp, "%s*%02X", str, nmea_cksum(str)); - xfree(str); - str = tmp; - - xasprintf(&tmp, "%s,,,E,,E*%02X\n", str, nmea_cksum(str)); - xfree(str); - str = tmp; + xasprintf2(&str, "%s*%02X", str, nmea_cksum(str)); + xasprintf2(&str, "%s,,,E,,E*%02X\r", str, nmea_cksum(str)); gbfputs(str, fout); xfree(str); diff --git a/reference/track/expertgps.jtr b/reference/track/expertgps.jtr index 52481d0e2..00db991fe 100644 --- a/reference/track/expertgps.jtr +++ b/reference/track/expertgps.jtr @@ -1,64 +1 @@ -GEOTAG2,170621,A,3003.7310,N,09136.6210,W,0.0,0.0,250502,,E,A*4F,,,E,,E*17 -GEOTAG2,170955,A,3003.7670,N,09136.6340,W,0.6,342.6,250502,,E,A*41,,,E,,E*6E -GEOTAG2,171200,A,3003.7620,N,09136.4960,W,3.4,92.4,250502,,E,A*79,,,E,,E*5D -GEOTAG2,171248,A,3003.7400,N,09136.4430,W,3.8,115.6,250502,,E,A*4D,,,E,,E*17 -GEOTAG2,171441,A,3003.6920,N,09136.3170,W,3.8,113.8,250502,,E,A*42,,,E,,E*6E -GEOTAG2,171716,A,3003.5870,N,09135.9640,W,7.5,109.0,250502,,E,A*43,,,E,,E*6E -GEOTAG2,171746,A,3003.4680,N,09135.8010,W,22.2,130.1,250502,,E,A*7F,,,E,,E*24 -GEOTAG2,171820,A,3003.3230,N,09135.6940,W,18.3,147.4,250502,,E,A*77,,,E,,E*5D -GEOTAG2,171901,A,3003.2330,N,09135.5570,W,13.1,127.2,250502,,E,A*70,,,E,,E*5D -GEOTAG2,172046,A,3002.9840,N,09135.3850,W,10.0,149.1,250502,,E,A*7F,,,E,,E*24 -GEOTAG2,172110,A,3002.9410,N,09135.3930,W,6.5,189.1,250502,,E,A*4D,,,E,,E*17 -GEOTAG2,172151,A,3002.9280,N,09135.5760,W,14.0,265.3,250502,,E,A*7F,,,E,,E*24 -GEOTAG2,172235,A,3002.7740,N,09135.7870,W,19.6,229.9,250502,,E,A*7C,,,E,,E*22 -GEOTAG2,172308,A,3002.7310,N,09135.9230,W,13.7,250.0,250502,,E,A*7E,,,E,,E*26 -GEOTAG2,180423,A,3002.8380,N,09136.0160,W,0.2,323.0,250502,,E,A*45,,,E,,E*6E -GEOTAG2,180604,A,3002.8200,N,09135.9780,W,1.3,118.7,250502,,E,A*44,,,E,,E*6E -GEOTAG2,180706,A,3002.7860,N,09135.9680,W,2.0,165.8,250502,,E,A*40,,,E,,E*6E -GEOTAG2,180818,A,3002.7720,N,09135.9370,W,1.5,117.5,250502,,E,A*4F,,,E,,E*17 -GEOTAG2,181020,A,3002.7820,N,09135.8640,W,1.9,81.0,250502,,E,A*72,,,E,,E*5D -GEOTAG2,181109,A,3002.7810,N,09135.8300,W,2.2,92.0,250502,,E,A*70,,,E,,E*5D -GEOTAG2,181218,A,3002.8070,N,09135.7800,W,2.6,59.0,250502,,E,A*75,,,E,,E*5D -GEOTAG2,181422,A,3002.8470,N,09135.7120,W,2.1,55.8,250502,,E,A*76,,,E,,E*5D -GEOTAG2,181504,A,3002.8680,N,09135.6860,W,2.6,47.0,250502,,E,A*7E,,,E,,E*26 -GEOTAG2,181614,A,3002.8950,N,09135.6450,W,2.3,52.8,250502,,E,A*78,,,E,,E*5D -GEOTAG2,181701,A,3002.9210,N,09135.6280,W,2.3,29.5,250502,,E,A*79,,,E,,E*5D -GEOTAG2,181807,A,3002.9610,N,09135.6310,W,2.2,356.3,250502,,E,A*40,,,E,,E*6E -GEOTAG2,181951,A,3003.0190,N,09135.6390,W,2.0,353.2,250502,,E,A*4B,,,E,,E*17 -GEOTAG2,182039,A,3003.0470,N,09135.6470,W,2.2,346.0,250502,,E,A*49,,,E,,E*6E -GEOTAG2,182124,A,3003.0740,N,09135.6620,W,2.4,334.3,250502,,E,A*43,,,E,,E*6E -GEOTAG2,182217,A,3003.1080,N,09135.6620,W,2.3,0.0,250502,,E,A*4A,,,E,,E*15 -GEOTAG2,182318,A,3003.1330,N,09135.6800,W,1.7,328.1,250502,,E,A*4F,,,E,,E*17 -GEOTAG2,182437,A,3003.1810,N,09135.6810,W,2.2,359.0,250502,,E,A*4C,,,E,,E*11 -GEOTAG2,182813,A,3003.2920,N,09135.7120,W,1.9,346.4,250502,,E,A*4E,,,E,,E*15 -GEOTAG2,183136,A,3003.2240,N,09135.6960,W,1.2,168.5,250502,,E,A*45,,,E,,E*6E -GEOTAG2,183256,A,3003.1910,N,09135.6870,W,1.5,166.7,250502,,E,A*46,,,E,,E*6E -GEOTAG2,183402,A,3003.1580,N,09135.6900,W,1.8,184.5,250502,,E,A*41,,,E,,E*6E -GEOTAG2,183603,A,3003.1470,N,09135.7260,W,1.0,250.6,250502,,E,A*41,,,E,,E*6E -GEOTAG2,183648,A,3003.1490,N,09135.7580,W,2.2,274.1,250502,,E,A*49,,,E,,E*6E -GEOTAG2,183752,A,3003.1590,N,09135.8070,W,2.5,283.3,250502,,E,A*4A,,,E,,E*15 -GEOTAG2,183918,A,3003.1880,N,09135.8710,W,2.6,297.6,250502,,E,A*44,,,E,,E*6E -GEOTAG2,184015,A,3003.2170,N,09135.8780,W,1.9,348.2,250502,,E,A*40,,,E,,E*6E -GEOTAG2,184125,A,3003.2380,N,09135.8660,W,1.2,26.3,250502,,E,A*71,,,E,,E*5D -GEOTAG2,184237,A,3003.2170,N,09135.8850,W,1.3,218.0,250502,,E,A*4C,,,E,,E*11 -GEOTAG2,184401,A,3003.1920,N,09135.8750,W,1.1,161.0,250502,,E,A*41,,,E,,E*6E -GEOTAG2,184553,A,3003.1690,N,09135.8510,W,1.0,137.9,250502,,E,A*4E,,,E,,E*15 -GEOTAG2,184654,A,3003.1540,N,09135.8160,W,2.0,116.3,250502,,E,A*4D,,,E,,E*17 -GEOTAG2,184742,A,3003.1400,N,09135.7860,W,2.2,118.4,250502,,E,A*43,,,E,,E*6E -GEOTAG2,184841,A,3003.1350,N,09135.7410,W,2.4,97.3,250502,,E,A*71,,,E,,E*5D -GEOTAG2,184952,A,3003.1330,N,09135.7010,W,1.8,93.3,250502,,E,A*7B,,,E,,E*24 -GEOTAG2,185049,A,3003.1130,N,09135.6820,W,1.6,140.6,250502,,E,A*45,,,E,,E*6E -GEOTAG2,185214,A,3003.0630,N,09135.6640,W,2.2,162.7,250502,,E,A*47,,,E,,E*6E -GEOTAG2,185256,A,3003.0340,N,09135.6540,W,2.6,163.3,250502,,E,A*41,,,E,,E*6E -GEOTAG2,185338,A,3003.0110,N,09135.6460,W,2.1,163.3,250502,,E,A*4B,,,E,,E*17 -GEOTAG2,185511,A,3002.9460,N,09135.6230,W,2.6,163.0,250502,,E,A*4B,,,E,,E*17 -GEOTAG2,185632,A,3002.9070,N,09135.6550,W,2.1,215.4,250502,,E,A*4C,,,E,,E*11 -GEOTAG2,185724,A,3002.8850,N,09135.6850,W,2.4,229.7,250502,,E,A*45,,,E,,E*6E -GEOTAG2,185840,A,3002.8500,N,09135.7270,W,2.4,226.1,250502,,E,A*40,,,E,,E*6E -GEOTAG2,185928,A,3002.8240,N,09135.7600,W,2.9,227.7,250502,,E,A*45,,,E,,E*6E -GEOTAG2,190022,A,3002.7980,N,09135.7960,W,2.7,230.1,250502,,E,A*4D,,,E,,E*17 -GEOTAG2,190141,A,3002.7840,N,09135.8590,W,2.6,255.6,250502,,E,A*4D,,,E,,E*17 -GEOTAG2,190248,A,3002.7740,N,09135.9080,W,2.3,256.7,250502,,E,A*4A,,,E,,E*15 -GEOTAG2,190343,A,3002.7790,N,09135.9380,W,1.7,281.0,250502,,E,A*44,,,E,,E*6E -GEOTAG2,190449,A,3002.8070,N,09135.9570,W,1.8,329.6,250502,,E,A*4C,,,E,,E*11 -GEOTAG2,190557,A,3002.8280,N,09135.9800,W,1.5,316.5,250502,,E,A*47,,,E,,E*6E +GEOTAG2,170621,A,3003.7310,N,09136.6210,W,0.0,0.0,250502,,E,A*4F,,,E,,E*17 GEOTAG2,170955,A,3003.7670,N,09136.6340,W,0.6,342.6,250502,,E,A*41,,,E,,E*6E GEOTAG2,171200,A,3003.7620,N,09136.4960,W,3.4,92.4,250502,,E,A*79,,,E,,E*5D GEOTAG2,171248,A,3003.7400,N,09136.4430,W,3.8,115.6,250502,,E,A*4D,,,E,,E*17 GEOTAG2,171441,A,3003.6920,N,09136.3170,W,3.8,113.8,250502,,E,A*42,,,E,,E*6E GEOTAG2,171716,A,3003.5870,N,09135.9640,W,7.5,109.0,250502,,E,A*43,,,E,,E*6E GEOTAG2,171746,A,3003.4680,N,09135.8010,W,22.2,130.1,250502,,E,A*7F,,,E,,E*24 GEOTAG2,171820,A,3003.3230,N,09135.6940,W,18.3,147.4,250502,,E,A*77,,,E,,E*5D GEOTAG2,171901,A,3003.2330,N,09135.5570,W,13.1,127.2,250502,,E,A*70,,,E,,E*5D GEOTAG2,172046,A,3002.9840,N,09135.3850,W,10.0,149.1,250502,,E,A*7F,,,E,,E*24 GEOTAG2,172110,A,3002.9410,N,09135.3930,W,6.5,189.1,250502,,E,A*4D,,,E,,E*17 GEOTAG2,172151,A,3002.9280,N,09135.5760,W,14.0,265.3,250502,,E,A*7F,,,E,,E*24 GEOTAG2,172235,A,3002.7740,N,09135.7870,W,19.6,229.9,250502,,E,A*7C,,,E,,E*22 GEOTAG2,172308,A,3002.7310,N,09135.9230,W,13.7,250.0,250502,,E,A*7E,,,E,,E*26 GEOTAG2,180423,A,3002.8380,N,09136.0160,W,0.2,323.0,250502,,E,A*45,,,E,,E*6E GEOTAG2,180604,A,3002.8200,N,09135.9780,W,1.3,118.7,250502,,E,A*44,,,E,,E*6E GEOTAG2,180706,A,3002.7860,N,09135.9680,W,2.0,165.8,250502,,E,A*40,,,E,,E*6E GEOTAG2,180818,A,3002.7720,N,09135.9370,W,1.5,117.5,250502,,E,A*4F,,,E,,E*17 GEOTAG2,181020,A,3002.7820,N,09135.8640,W,1.9,81.0,250502,,E,A*72,,,E,,E*5D GEOTAG2,181109,A,3002.7810,N,09135.8300,W,2.2,92.0,250502,,E,A*70,,,E,,E*5D GEOTAG2,181218,A,3002.8070,N,09135.7800,W,2.6,59.0,250502,,E,A*75,,,E,,E*5D GEOTAG2,181422,A,3002.8470,N,09135.7120,W,2.1,55.8,250502,,E,A*76,,,E,,E*5D GEOTAG2,181504,A,3002.8680,N,09135.6860,W,2.6,47.0,250502,,E,A*7E,,,E,,E*26 GEOTAG2,181614,A,3002.8950,N,09135.6450,W,2.3,52.8,250502,,E,A*78,,,E,,E*5D GEOTAG2,181701,A,3002.9210,N,09135.6280,W,2.3,29.5,250502,,E,A*79,,,E,,E*5D GEOTAG2,181807,A,3002.9610,N,09135.6310,W,2.2,356.3,250502,,E,A*40,,,E,,E*6E GEOTAG2,181951,A,3003.0190,N,09135.6390,W,2.0,353.2,250502,,E,A*4B,,,E,,E*17 GEOTAG2,182039,A,3003.0470,N,09135.6470,W,2.2,346.0,250502,,E,A*49,,,E,,E*6E GEOTAG2,182124,A,3003.0740,N,09135.6620,W,2.4,334.3,250502,,E,A*43,,,E,,E*6E GEOTAG2,182217,A,3003.1080,N,09135.6620,W,2.3,0.0,250502,,E,A*4A,,,E,,E*15 GEOTAG2,182318,A,3003.1330,N,09135.6800,W,1.7,328.1,250502,,E,A*4F,,,E,,E*17 GEOTAG2,182437,A,3003.1810,N,09135.6810,W,2.2,359.0,250502,,E,A*4C,,,E,,E*11 GEOTAG2,182813,A,3003.2920,N,09135.7120,W,1.9,346.4,250502,,E,A*4E,,,E,,E*15 GEOTAG2,183136,A,3003.2240,N,09135.6960,W,1.2,168.5,250502,,E,A*45,,,E,,E*6E GEOTAG2,183256,A,3003.1910,N,09135.6870,W,1.5,166.7,250502,,E,A*46,,,E,,E*6E GEOTAG2,183402,A,3003.1580,N,09135.6900,W,1.8,184.5,250502,,E,A*41,,,E,,E*6E GEOTAG2,183603,A,3003.1470,N,09135.7260,W,1.0,250.6,250502,,E,A*41,,,E,,E*6E GEOTAG2,183648,A,3003.1490,N,09135.7580,W,2.2,274.1,250502,,E,A*49,,,E,,E*6E GEOTAG2,183752,A,3003.1590,N,09135.8070,W,2.5,283.3,250502,,E,A*4A,,,E,,E*15 GEOTAG2,183918,A,3003.1880,N,09135.8710,W,2.6,297.6,250502,,E,A*44,,,E,,E*6E GEOTAG2,184015,A,3003.2170,N,09135.8780,W,1.9,348.2,250502,,E,A*40,,,E,,E*6E GEOTAG2,184125,A,3003.2380,N,09135.8660,W,1.2,26.3,250502,,E,A*71,,,E,,E*5D GEOTAG2,184237,A,3003.2170,N,09135.8850,W,1.3,218.0,250502,,E,A*4C,,,E,,E*11 GEOTAG2,184401,A,3003.1920,N,09135.8750,W,1.1,161.0,250502,,E,A*41,,,E,,E*6E GEOTAG2,184553,A,3003.1690,N,09135.8510,W,1.0,137.9,250502,,E,A*4E,,,E,,E*15 GEOTAG2,184654,A,3003.1540,N,09135.8160,W,2.0,116.3,250502,,E,A*4D,,,E,,E*17 GEOTAG2,184742,A,3003.1400,N,09135.7860,W,2.2,118.4,250502,,E,A*43,,,E,,E*6E GEOTAG2,184841,A,3003.1350,N,09135.7410,W,2.4,97.3,250502,,E,A*71,,,E,,E*5D GEOTAG2,184952,A,3003.1330,N,09135.7010,W,1.8,93.3,250502,,E,A*7B,,,E,,E*24 GEOTAG2,185049,A,3003.1130,N,09135.6820,W,1.6,140.6,250502,,E,A*45,,,E,,E*6E GEOTAG2,185214,A,3003.0630,N,09135.6640,W,2.2,162.7,250502,,E,A*47,,,E,,E*6E GEOTAG2,185256,A,3003.0340,N,09135.6540,W,2.6,163.3,250502,,E,A*41,,,E,,E*6E GEOTAG2,185338,A,3003.0110,N,09135.6460,W,2.1,163.3,250502,,E,A*4B,,,E,,E*17 GEOTAG2,185511,A,3002.9460,N,09135.6230,W,2.6,163.0,250502,,E,A*4B,,,E,,E*17 GEOTAG2,185632,A,3002.9070,N,09135.6550,W,2.1,215.4,250502,,E,A*4C,,,E,,E*11 GEOTAG2,185724,A,3002.8850,N,09135.6850,W,2.4,229.7,250502,,E,A*45,,,E,,E*6E GEOTAG2,185840,A,3002.8500,N,09135.7270,W,2.4,226.1,250502,,E,A*40,,,E,,E*6E GEOTAG2,185928,A,3002.8240,N,09135.7600,W,2.9,227.7,250502,,E,A*45,,,E,,E*6E GEOTAG2,190022,A,3002.7980,N,09135.7960,W,2.7,230.1,250502,,E,A*4D,,,E,,E*17 GEOTAG2,190141,A,3002.7840,N,09135.8590,W,2.6,255.6,250502,,E,A*4D,,,E,,E*17 GEOTAG2,190248,A,3002.7740,N,09135.9080,W,2.3,256.7,250502,,E,A*4A,,,E,,E*15 GEOTAG2,190343,A,3002.7790,N,09135.9380,W,1.7,281.0,250502,,E,A*44,,,E,,E*6E GEOTAG2,190449,A,3002.8070,N,09135.9570,W,1.8,329.6,250502,,E,A*4C,,,E,,E*11 GEOTAG2,190557,A,3002.8280,N,09135.9800,W,1.5,316.5,250502,,E,A*47,,,E,,E*6E \ No newline at end of file -- 2.30.2